Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[GH-45] add trollface #46

Merged
merged 5 commits into from
Mar 1, 2021
Merged

[GH-45] add trollface #46

merged 5 commits into from
Mar 1, 2021

Conversation

ghost
Copy link

@ghost ghost commented Feb 18, 2021 •
edited by hanzei
Loading

Summary

This PR adds the "Trollface" meme.

Ticket Link

Fixes #45

@ghost ghost requested a review from hanzei as a code owner February 18, 2021 13:44
@jfrerich jfrerich added 2: Dev Review Requires review by a core committer 3: QA Review Requires review by a QA tester labels Feb 18, 2021
hanzei
hanzei requested changes Feb 19, 2021
View reviewed changes
Copy link
Contributor

@hanzei hanzei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for adding more memes 🎉

Could you please scale down server/memelibrary/assets/images/trollface.jpg? It huge right now.

Could you also please remove the unrelated changes in server/memelibrary/assets.go?

server/memelibrary/assets/metadata/trollface.yaml Outdated Show resolved Hide resolved
@ghost ghost force-pushed the add_trollface branch from 93a1ebf to 3e486e6 Compare February 19, 2021 12:27
@hanzei hanzei self-requested a review February 22, 2021 11:07
hanzei
hanzei approved these changes Mar 1, 2021
View reviewed changes
Copy link
Contributor

@hanzei hanzei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@hanzei hanzei added 4: Reviews Complete All reviewers have approved the pull request and removed 2: Dev Review Requires review by a core committer 3: QA Review Requires review by a QA tester labels Mar 1, 2021
@hanzei
Copy link
Contributor

hanzei commented Mar 1, 2021

Tested locally

@hanzei hanzei added this to the v1.5.0 milestone Mar 1, 2021
@hanzei hanzei merged commit dce6ca0 into mattermost-community:master Mar 1, 2021
@SunBlack SunBlack mentioned this pull request Sep 10, 2021
Closed
This was referenced Sep 6, 2022
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
4: Reviews Complete All reviewers have approved the pull request
Projects
None yet
Milestone
v1.5.0
Development

Successfully merging this pull request may close these issues.

Add trollface meme
2 participants
@hanzei @jfrerich